From c1b219c28cd7fd39cd9c8fe9167d566b5d1b98cc Mon Sep 17 00:00:00 2001 From: Sam Steingold Date: Tue, 7 Jul 2009 15:06:00 +0000 Subject: [PATCH] (vc-cvs-merge-news): Fix message parsing for non-top-level files. --- lisp/ChangeLog | 5 +++++ lisp/vc-cvs.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4819798fd47..f940a3ef41b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-07-07 Sam Steingold + + * vc-cvs.el (vc-cvs-merge-news): Fix message parsing for + non-top-level files. + 2009-07-07 Kenichi Handa * international/mule-cmds.el (reset-language-environment): Put diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index c3f94dc2a15..6ef8db50537 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -457,7 +457,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION." 0 ;; there were no news; indicate success (if (re-search-forward (concat "^\\([CMUP] \\)?" - (regexp-quote (file-name-nondirectory file)) + (regexp-quote + (substring file (length default-directory))) "\\( already contains the differences between \\)?") nil t) (cond -- 2.30.2